More (undertested) expat test sense changes.

diff --git a/gpsbabel/coastexp.c b/gpsbabel/coastexp.c
index a361e438109b50adc4a78520b6376b4e307626d2..a7909b896cf2af8283ceae84f622e0bb5cf4c4d1 100755 (executable)
--- a/gpsbabel/coastexp.c
+++ b/gpsbabel/coastexp.c
@@ -19,10 +19,11 @@
 
 #include "defs.h"
 #if HAVE_LIBEXPAT
-#include "xmlgeneric.h"
-#include <expat.h>
-static XML_Parser psr;
+#  include "xmlgeneric.h"
+#  include <expat.h>
+   static XML_Parser psr;
 #endif
+
 #include <time.h>
 #include "cet_util.h"
 
@@ -37,7 +38,7 @@ static FILE *ofd;
 #define MY_TBUF 64
 #define MY_XBUF 128
 
-#if NO_EXPAT
+#if !HAVE_LIBEXPAT
 void
 ce_rd_init(const char *fname)
 {

diff --git a/gpsbabel/jeeps/gpslibusb.c b/gpsbabel/jeeps/gpslibusb.c
index f3d94e63b3eb8f3499d3d148c613afdf83984097..0183ffc06587a9060af7ac1a400fd90e800e07c4 100644 (file)
--- a/gpsbabel/jeeps/gpslibusb.c
+++ b/gpsbabel/jeeps/gpslibusb.c
@@ -1,4 +1,3 @@
-#if HAVE_LIBUSB
 /*
     Physical/OS USB layer to talk to libusb.
 
@@ -24,6 +23,7 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <usb.h>
+#include "../config.h"
 #include "gps.h"
 #include "garminusb.h"
 
@@ -254,5 +254,3 @@ void garmin_usb_scan(void)
                fatal("Found no Garmin USB devices.\n");
        }
 }
-
-#endif /* HAVE_LIBUSB */

diff --git a/gpsbabel/xmlgeneric.c b/gpsbabel/xmlgeneric.c
index 3aae2d0ab275eea135f6a82264ba5b13fe497078..c5c3d38714be4b974591c2d937d6d4b82005c9d8 100644 (file)
--- a/gpsbabel/xmlgeneric.c
+++ b/gpsbabel/xmlgeneric.c
@@ -326,6 +326,10 @@ void xml_deinit(void)
 {
 }
 
+void xml_readstring(const char *)
+{
+}
+
 #endif /* HAVE_LIBEXPAT */
 
 /******************************************/